Auto merge of #4163 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 13 Jun 2017 17:40:00 +0000 (17:40 +0000)
committerbors <bors@rust-lang.org>
Tue, 13 Jun 2017 17:40:00 +0000 (17:40 +0000)
Update dependencies

Brings in a few fixes for Windows-related dependencies


Trivial merge